#include<stdio.h>

int main()
{
    printf("hello\n");

    printf("hot fix test\n");

    printf("金贵，新年好！\n");

    printf("加油\n");

    printf("confict merge\n");

    printf("confict merge\n");

    printf("hot fix test\n");

    printf("我在远程做了修改\n");
    
    return 0;
}
